Merge from emacs-24 branch; up to r108077
authorChong Yidong <cyd@gnu.org>
Sat, 21 Jul 2012 06:14:00 +0000 (14:14 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 21 Jul 2012 06:14:00 +0000 (14:14 +0800)
commit82929b81ddfc3d2d558c6803ea47d8a4598bcdfd
treeae9e0a1fdffff5c2c4bdd55df8821157ddf34dc5
parent88970e4f75d4e047317581578876affe48df9302
parent88a4881f553d79257234e98b9dd84f493fecd2b8
Merge from emacs-24 branch; up to r108077